Better logging and more stuff

more stuff equals better performance