server updates - helper functions and more