Cleanup + minor additions