Various bug fixes
Use runbot badge