-Fixed bugs with entering construction mode