Additional bug fixes

One can still take the king though, which is a large problem