fixes #27; fixes #30; fixes #31;