Re-added some doc comments. Started porting some more classes.