Added option processing and improved the fading