Finished Fade, fixed multiple bugs