clean up, fix ordering, fix roles