more progress and hopefully make the server stable a little more