Correcting a couple paths; localizing a couple vars