fixes #155; fixes #157; fixes #154;