fix semantic stuff
Merge branch 'master' of github.com:adlaiff6/df