Removed debugging stuff
Improved help