Update make tasks; add server tasks