Added a lot of things and made some cleaning