removed todos from source file, moved them to github/issues