bugs fixed and added fade transition