Fixed documentation, made export choices