Squashed more bugs
Not ready for primetime, but will be important down the line in extending these tools