implemented Barneys PR comments (except WCS)
(#376)