self validating connector facades + fixes after review