some refactoring and issue linking
upcoming feature added