Fixed some methods, added blocks, Tweaked a few things