Fixed methods issues.
//TODO ..code refactor.
Some bug fixed, also all test passed.
//TODO .. Refactoring