fixed issues found on first test.