fixing little things from previous commit
cleaning up code and comments and such