handle multiple declarations on one line, and more!

Fixes #1