Some more commits. One of these days I'll have to get rid of the bad files.