Minor fixes.
Logging dependencies changed. FIXMEs added and logs fixed.
Logs addapted to slf4j format