piles of fixing and cleanup