uptime and swap improvments