Fixed a bunch of stuff & added import/export