Made several usability updates
Removed debugging information