A bit of cleanup and doc additions/fixes