cruft cleaning and variable fix