further changes and progress with components