Fixed Minor bugs, removed useless comments