final adds and fixes