Fixed all junk issues