More fixes
updated todo
deleted todos
did all @kije todos in src code... there are still some in the TODO file