cleaned up generator script; tweaked movement behavior