some cleaning in commenbts and moved around stuff to folds