achievements fix, manual merge + const changes