Added ability to renable special encounters as a flag
fixed merge