Woo back in business

Fixed some bugs ("changes") introduced during previous debugging session
and tweaked mode settings, first few modes look great now