Fixed a few things and added some debug messages to look at during the meeting