minor update, removed some logging, change code comments