Commented debug messages/methods, minor fixes