Debug printf removed. Code tidyups to fix gcc warnings

Minor bugfix release. A debugging printf had been left in, and gcc prints out a number of warnings on compilation. Both these have been corrected.