minor additions and fixes