bunch of fixes
Merge branch 'theday' of github.com:tfrce/thedaywefightback into theday