Fixed errors in all methods, should be finished now