Repairs and some refactoring