Better logging
Small fixes
More documentation
More comments