real: some minor cleanup/todo work.