some class changes and doc changes...