blah
misc updates