Fixed errors in several methods, clarified some code.