questing stuff and a couple of fixes