Feature/minor booking tweaks