Cleanup of many small issues