bug fixed, problem from last commit resolved and a lot of renaming