Fixed some issues... not

Bullshit fix for Web.de. Needs entire rewrite because I'm a moron.