added panic recovery
Multiple updates and fixes
Multiple updates and fixes