Added Score

Minor bug fixes as well.