Integrating common include directory, fixed some bugs, some usuability fixes for redundant steps