Added a few more options, more work on scoring system