Fixed some issues that could cause start-up latency
and added updated Server framework