More intermittent improvements and cleanup