feature #1664: Chagnes to datastore creation

And some other bits & pieces
feature #1664: Log css