Fixed a couple of bugs that were found. Created a comment to inform me of where I left off.