move stuff around, fix things