Clean up some achievement, bonus, and shield weirdness.

Signed-off-by: Matt Cleveland <mgcleveland@gmail.com>