Fixed some variables that were leaking to user environment, fixed automatic cleanup of variables
Checking another item off the milestone list