changed the arguments for the while loops a little; got rid of the
unnecessary auto-generated todo messages