Better logging, more function work