Fixed small issues
Added a few methods
Removed