Fixed one thing that was wrong, still needs work.