major i++ bugfixes from joey
Fixed some annoying "debugging" code from Djekko