Final touches to make the package to install. Also some cleanup.

ALWAYS REMEMBER TO ADD @export (unless you know what to do)