Added Testing printouts and some minor changes.