improved a bunch of junk