export inlcuding comments + fix