fixing #60, #63 + small things