exp fixes, more needed