Improvements and bug fixing to the insurance company module