mostly cleanup and work on component setup.