Forsaken Facilities: Optimization and Bug fix

Small optimizations were made to increase performance