delete some and add some fixes #1

delete some and add some aaaaaaaaaaaaaaa