clean up logging
more cleanup

renaming, move dot stuff up to main