small adjustments on exports and design