tidied up minor todo notes