Added several basic improvements.