better support for org mode
minor clean-up