Finished fixing the trapped rooks code