Got Bart and mgood feedback, made changes