One down one to go!
#2 solution works great, so thanks for the quick turnaround on that.
#1 - no this occurs even with galleries defined.
when first loading only 'choose gallery' is shown, if i reload still only first option but this makes sense if no gallery is chosen.
1st step is to choose the gallery, this should then display the other options. but it doesnt. If I reload the page after selecting a gallery all items appear as should be.
Hope this additional info helps identify where the problem might be.