Strip some whitespae
Partially fix parsing for current generation instances
Update resources
Remove commented out lines
Update tests

Some still fail, but this is at least an update.
Merge branch 'pr_2'