stuff working nicely now