fixed #54
fixed #56
fixed #55
minor fixes