The project bootstraps again, all the tests pass

Fix #52 and #50