hw1: bugs fixed
some style fixes