some fixes; more are needed