Trippy Trail and other minor fixes

.