- Remove hard-coded dependency on /volume location, use working
directory instead.
- Assorted small changes.