Updated logging a bit