add name and remove info from building and some changes