added export statements for unexported things