some minor changes in the castle moves