Made some quick bugfixes and removed some annoying stuff.