Further improvements on support for instance based network descriptions.
Minor changes to comp type definitions.
Fixes #4