mass updates and added stuff