Various changes on the booking-module