updates, house cleaning
Merge https://github.com/c-concat-p/skate-or-dye