Added in some minor logging features
Changed the logging options so they are contained in "if-else-then" statements