Committing some WIP bug fixes, but it's still not done.