Commits


Minor fixes and reorganization


Added Miniontoby's suggested patch for VPNs


Imported sources