Fix issues #83, #84, & #85

I have fixed some of the issues I found while using my project.