some fixes
Merge pull request #1547 from conejoninja/slugloc

Slugloc