many bug fixes 27/5