Re-order methods.
Fix unregistering of components from allComponents.
[Bleeding] Lessen trouble with boats.