Fixed issue with accessors not making
fresh paths/urls.
Refactoring, cleanup.