various updates made during testing