Some minor fixes. Scaling still doesn't work right.