A few scattered additional features and a bug fix.