Adds logging and some other nicities