Updates scoping and fixes ratings
Updates tests accordingly; Fixes them
Bumps to 0.2.1