Some cleanup, some fixes and near-final aiming.