Minor changes, added server time binds