Fixes to links and forward URLs in filestorage
Oops I left some debug stuff around
Merge pull request #503 from tuscanhobbit/master

Fixes to links and forward URLs in filestorage