Added more achievements.
Remove some null value errors