fix some not-cool things
Merge branch 'master' of github.com:ytnobody/App-Shiroh