updates from 20141022

changed up the switch between building and fire pages based on the data
in the file