knocked out few more todos
more changes