Uptick options toc
Clean up logging system & refactor