working on new client: detecting violations of Collections.unmodifiable(). Also did a bunch of cleanup in Main