some renaming refactoring and few solved problems