IE fixes & clean up