Various changes

Fixes #83 and #104.

I also made the build because the current master is not built.