Changes

added logging
bunch of tweaks from competition
changes1.1

bunch o tweaks post competiton