minor changes plus more commenting