Added more logging, removed some extraneous comments