removed bugs, added new fade/show