[ADDED]: added some fixes.