put comments back, added resets on transforms/scaling