Comment threads and server work fixed