More stuff being changed. Switched over to Slf4j for logging.