Fixed map function and completed all but the last one