cleaning, bug correcting