cleaning
Testing, minor fixes.