fixes to castle hawkthorne