Squashed a few bugs with partials and variables.