some minor changes
improved fade out fade in