Fix #4 and #2 (blinking limits and fading)