Updated list to work better and make move.c compatible with changes.