Review of attributes and models

Applied some revision from Svein.
Attributes have been changed to engineering units.