More improvements as described in email