Finished fixing all of issue 7.