Added more output and plots