server fixes, connecting to MOCK now