Amendments to CW6.hs - added empty list cases