Incorporating one crash issue and some coding convensions.