Jewelerize the project to make maintenance easier; fix some random snafus