willem mods

some simplifications