added better decorator-constructor and tooltips