Fixes in Bloomberg Classes

Closes #164
Closes #163