Worked on parsers and made other random tweaks