fixed suggestion bug, some refactoring
bump