Time for the logger + general improvements