addressed fixes from request #2