other little bugfixes and tweaks from TripNRaVeR