Fixes from review

Added most the fixes suggested by Volker.
Deleted ComponentPositions as this is being dealt with in a separate
branch.