Updates to get Buffered Reader and Writers to work and fix a few bugs turned up by the new unit test.