Fixes #96 and other minor updates