doco and api cleanup