Several changes to achievements. Logic may be off.