#82 cleanup realized in the time system chart and bugs fixed.