Added etc halt conditions, and bug fixes