some more minor changes and completion of the castle quest