some minor fixes
some logging on original main methods
tonights final state