* Some more consistent naming
* Fiddled with debug output