Some minor adjustments and bug fix if no point is returned by the server