cleanup of stuff relating to variable names. i know how to fix the
phantom variables now.