Fixing boundary reading etc
Cleaning