Fixed server/timeout and other issues