general updates and modifications