updates and name fixes