fixes #44 & minor impros