fixed timer (mostly)
Merge branch 'master' of github.com:adam-bratin/nihilism