Better waving and hand updating and destruction support.
changes merged: