some bug fixes and new functionally

commented out floating control legend