committed a bunch of updates
added macro to make susy cocktail