Fixed more minor bugs left, duh.