cleanup and fixes : now both the development and the preview buildouts
run OK.