Improved achievement system

see c673b90