Comments and cleanup -- as well as a lot of data collecting