Casteling changes

Added checks and defaults for casteling move