FIXED keep-alive, fixed some typos