changed another lot of stuff