Bug fixes and reduction console use

Fixed a few bugs and reduced the number console calls as it was eating
a lot of processor overhead