added some fixes!