Adds last missing pieces for multiline comment handling
Uses safe string manipulation

Should error out when access is out of bound