Miscelleaneous bug fixes and minor changes - preparing for complete refactoring with deployed components