reviewed and fixed some files