Misc changes

I was just reading through code again and noticed some missing documentation. Hopefully I interpreted it correctly.

`_getSandboxLocation` code struck me as a bit odd. I think this makes more sense, but I might be overlooking something.