Minor Adjustments

Including changing variable names, small clean ups, version change,
fixed an error.