some fixes; need more