O_O Nice improvement

signature: four right, two misplaced, three wrong.