various opentrail and hikar updates