Added some fixes to the live test and a few things on the rest of the co...

...de for clarity.