fixed several gc's