fix export issues; add 'basic' stuff