Fix number parsing and allow more arbitrary tests
Some more fixes, EVALUATE nearly working