Fix various code to revamp the bot for testdays (#26)
merging upstream