added some fixed