more fixes for #32 #33 #34