checking in some changes from may that weren't pushed