Improvements and crash fix

Improvements and crash fix