Milestone 5

merge ie fixes