Some bug fixes

And prep for region filter on instances.
Merge pull request #34 from andylyall/2014.03

Some bug fixes