Fixed a few things and added trim, add/remove class methods
Fixed a few mistakes