Fixed some derps, additions to uptime