Cleaned up code, added scoring system, and other small changes