some mods, fixes #22