IE fixes & clean up

IE fixes & clean up