Added a few shorthands and tweaked logger