Fixed more bugs, again