Fixed a few more bugs and the ellipsis (maybe?)

I think it fixed that dumb bug and the ellipsis problem. The ellipsis problem may only be slightly fixed through.