Made a couple of fixes; still needs work.