new subcat section + some fixes