update repo with most current changes from cottrell