fix fade bugs. fixes #39 fixes #40