changed rich as per Yigabar's request
added simmonsisfinished's changes to vicki
Merge pull request #768 from NimbusBP1729/rich_yigabar

Rich and Vicki update