issue 10: more fixes