added completion ratios and fixed bugs