Fixed/Improved finish manager module