Version 2 bug fixes and minor improvements

After the huge amount of code included in the 2.0 release there were some bugs that popped up. This fixes the ones reported, and also includes some improvements to labels for trading, and a web service for use in other projects.