some small work and merge fixes

author: nhhughes
more merge fixes

author: nhhughes
linked in local cache, autorefresh and create working

author: nhhughes