Record comments and minor server cleanup