added assignment 2, fixed style bugs