Cleaning up,finxing and other stuff