fixed indentation; added some TODOs