Added all 20 bots so far, minor tweaks and bugfixes