few fixes and name changes