fixed remaining issues needed prior to integration with container