HUGE improvements, close to final look.