Fixed more bugs, submitting this one probably