Added some more logging and switched logging lib