Fixes #83 and fixes