Add advice macro and more evil tweaks