some updates, + index