fixed quest and radar bugs, among other things :beer:
fixed merge conflicts :melon: