and theme set up, parameter cleaning. This  is just being committed now
so I can pull, not to be considered complete