minor improvements - this should be about it...