lots of changes, also added testbot