addresses various review comments