fix assumptions that cause breakage

Also fixes #11