Lots and lots of relatively minor changes. Many files will be cleaned up later, are result of interface experiments.