Comments and various cleaning up.