fixed up some and added some (mostly non useful for now)