Made Cr_svy_weights and other restructuring.
Added investment var definitions.