coma and options fixes, timetravel count
new boosts
Merge remote-tracking branch 'origin/master' into gh-pages