old & new changes

the first two commits are actually ancient, no idea why they weren't pushed...