added progress table + code cleanup