issues #3 and #5 resolved