Reorganized and added a few