Fixed All bugs but score bug

ALMOST DONE .. omg..