added uptime, fixed some bugs