Fixed questing bug and cleaned up some code