some changes & fixes, time added for c/o pop