Removed 'used' warnings
Fixes missing include, commented out unused debug method
Fixed init bug