added a few fixed