More logging options + better logging info