Cleanup some routing. Fix some part numbers