Added booking comparison testing, various random updates