added some fixes