Added HW

New functions and fixed from lab