Fixed Parser
Now parsing conditionals, still largely inconvenient
Improved value parsing and added Parsec's expression parser