Issues #28, #74, #72