bugfix, added type to export, etc