Fixed Map function some, added collect function