Add some more Org keywords and adjust logging