various of small updates and name changes