tweaks to all individual containers and fixed overflow