General fixes.

* Removed debugging message
* Cleaned up invalid argument messages
* Housekeeping and cleaning more stuff.