Some Fixes

Also automatically check for valid server keys