Prop Editor v2.0

small bug fixes etc.