Jamie fixed problems with movegen
merge