further changes
finished overview fixes
finish overview bug fixes