Fixed indentation, added some todos