cleanup and adding of mostly SUSY variables