bunch of changes

hope this works.