Repairs and Improvements

[Not a valid template]