updated stuff AGAIN
added fade