bug fixed
Some bugs + cleaning up code.