Major changes

did some nasty stuff