Better structure, added system uptime clock