bunch of changes

alsdf