small fixes for

fixed #30
fixed #31
fixed #32
fixed #33
fixed #34
fixed #35
fixed #36