Adding orgclasses and some tweaks to index