Some testing done with some minor corrections.