Fades are in sync and other small fixes