Added Quest, bug fixes