Fixes for August

Various fixes and additions for August.

[del]Unfortunately, the commit did not come down as clean as I would like.[/del]

Rebase to the rescue!