fixed some, added some!