some refactoring, added stars and almost edges