Added a few, fixed a few