more testing and fixing for I.E. and production mode