some cleaning, some plot fixing