Corrected bookings and started some rdoc commenting