Fix captures and some moves for Grand & Wildebeest