1) Re-format
2) Fix up the keyPrefix and path handling of slashes...