stuff server and client fix