Restored some documentation and exports