typos fixed, todo trimmed