Simplifying, and IE bug fixes