June 17 Commit; Not much changed... Made the server run with keyboard interrupt catch