Fixed warnings/errors; renamed connectors.