Cleaned up.
Initialisation state fixes.