[enh] Network: better parsing of endpoint
[enh] Network: small code refactoring (rename some variables)
[enh] Settings: distinguish fix options, from those that user can change