Added rotating server function
Minor updates