fixes; tests