some cleaning, still buggy