Code review and comment updates; Blade 2 RC1