Make behavior for marks reasonable
Fix some org mode stuff