changed quite a few things

can't remember what