minor changes

added fade in fade out. bad implementation.