fixed up a couple of stuff