Deal with some more IE related insanity..
Mostly style and cleanups etc.
WITH-SW-AGENT / MK-SW-AGENT: Better handling of bindings.