Update REGEX and other slight modifications as per the exercises of 6.5