proofreading and some more todos