whitespace clean up, additional scripts and logging