More work on various things.