Some changes off Scott's testing

Changes listed in software document on shared folder