Added proper links and more future plan details