Added some methods, fixed some methods and removed some methods.