Added some fixes and removed bloat