fix ordering of things