spelling, minor changes, some todo placeholders added