Added logging and some quick updates