fix things in the right place