Add TODO section; fix inline literals