More logging, bug fixes