more updates to areas with items and code cleanup