Minor fixes; testing in progress