Fixed mis-spelled variables and merged in files from old package.