Vna/mods

Looks like some more modification can be merged now

Could you please review and merge them 

Please let me now if I can help or should change/improve some of the commits

Kind regards
Vlad