spacing, comments, more sane export definitions