small fixes and components (work in progress)