fixed some achievements
merge conflicts