addressed issues #72 and #71 + a few responsive updates