cleanup wording; add todos