minor loggin improvements and some renaming