And fixed a few more bugs.