org
some tweaks to custom syntax