various tweaks, fixes #178 hopefully