fixed draw func stack, cosmetics