Bot improvements