fix things up and move around