fixed cr helper + other shit