More achievements and fixes