Correcting some issues.

fixed some generation issues with the vars. ${module}