Various short work

Variable name corrections, cosmetic update.