Start working on IE7 support, some debugging left enabled