updates

updates after meeting with mark