added support to emergency and instance type, updated documentation and other minor changes