#2: more fixes