Finalizing features

Program now conforms to the instructions in the course.