changes in effects + some fixes