Fixes after code review. Changes to constructor use mainly.