Lots more testing and fixing bugs