Added logging

- Added logging by org.slf4j
- Some non-critical changes