Fix errors in code.
More fixes.
Merge pull request #264 from isaach1000/develop

Fix error in code and typo.