Copps (216). Style and functionality fixes