added some fixes
added some fixes