removed todos, refactored scripts. fixes #3