JavaDoc update
Corrected returns
Added separator to 'uptime'