changed scripts a little

-fixed "one off" index bug
-changed around the to-do's a little bit
-generally cleaned up the scripts a bit more