rearrange a lot of stuff, name fixes