several changes, Fixes 10