making sure things are synced up
cleaning up