Continuing with state machines, numerous fixes, and a complete visual overhaul.