error handling and minor changes
normal critical and warn
lot change