More doco and renamed methods