Fixed some methods, added some methods.