a few more last minute fixes
merge of fx's quest stuff