Small fixes
More fixes
Fixing trail closing #13