Bug fixes that arose due to refactoring.
More refactoring.
Refactoring.
Removed standalone.