Work in progress, fixed some doc comments.