Added more achievements
Merged some changes (I think)