Some minor changes, tests and cleanings ...