minor changes, updated todo