fixed some code problems
solved some code problems