Mainly code style changes and some IE related stuff