commented on some methods
fixed various errors