updated hw04 and lab04