Slight improvements in bot logic