Added extra credit, fixed minor problems