More house-cleaning and merging/incorporating submissions