Several bug fixes (from TE's todo items)

A pass through your todos