Bugfixes, partially routed.