Small improvements, hit an issue with checkmate not working.