moved aliases to custom
edited user variables