Actually finished what I was doing this time, and fixed a bug while I was at it.