minor improvements - mostly formatting etc.