minor cleanup
various corrections