Clean up parsing and page spec
Update version