Made the zone file more sensible
Clean up exception handling on main loop