corrected mistakes. No tests run yet.