Removed a few debugging messages and fixed a few comments