Last logging stuff and comments adjusted