Bug fixes. Menu system updated. Unit tests updated.