export properly
different fixes