Maintenance tools

Partially fixes #50