code fixes during testing