Added Logger and a few other small changes