Server Performance Fixes.

Added Comments