asdf,misc stuff, no actuall changes