Achievements basics, some fixes