Tidying up. Added new macro. Changed default fade.