Fixed more bugs. Shoot me.