fixing server bugs