Further improvements on the usecase diagram, and export