solved a number of issues...