fixes to merge Questions & Trails