Cleaning
fixing dot
A lot of changes