some adds and fixes