added doc comments, removed deprecated calls