cleanup + a few properties.