Fixed some more design flaws. Prop point names still can't be guarantueed to be valid.