further teaser and general improvements