fixes on stock, and widget tool