Cleanup, Method to Properties
+ When creating Edge shapes call the Property Dynamic instead of just setting the variable.  That way other variables are set correctly.