Fixed typo's and cleaned up some parts. #107