(more) tested castling
misc changes to castling