Fix some bugs

[reteps]

• Hi there, I have talked with you over email. I spend some time today investigating if pymake will work for my needs. Unfortunately, there is a lot of complexity here that I feel can be eliminated by directly working with a parsing library.

I open this pull request to mark some WIP code I wrote to play around with the code base and get it working better.