Improved bot stuff