Added AddBooking() and fix a lot of minor stuff