tidied, setup some todos