fixes and changes for dev review 3