Removed the use of Logger. 
Removed some warnings.
Fixed John's list of defects.