Result output manipilation & some upgrades