bug fixes
Merge branch 'develop' of https://github.com/UVM-BIRD/junco into develop