addressed fixes from request