made mongoose suggestions

all suggested changes are on server side and commented out with **