Car Sharing update

Various update and modification. Majority working now