Bugfixes + works in IIS