some changes
resolved conflict
moved normalization before basis expansion