Comments/Logging 2nd time
Fix layout (little bit)