improve exports, add comments