fixed some things
Merge https://github.com/lxdr/Glidden