More minor changes. Issues with types.