Added fades and cleaned up code