merge Brian's branch into dev

repo clean up