version 0.6

Fixed some bugs, added final score calculation