Use immutable. Fix a couple things.