Made the parser more comprehensive
Made the parser a little safer with returning data