Updated SOLVER (working)

Changes to Parsing, symbols, additional changes to syntax not needded