Commit six. Fixing some errors I found.