Fix exports and add button
Remove comment
Fix up some more export errors