small chances
improved ai, small changes
fixed merge conflicts