reduced duplicate server methods; made changes where applicable; still in progress