added uptime, fixed some bugs
fixed one thing