minor changes + some doc