Doing some cleaning and adding two not solved problems