added and fixed some annotations and DocBlocks.