Some Fixes + update on handle unconfirmed booking