org export proper html + some changes