various changes

From four months back actually, they served us well and should be a good addition to the official repo.