Moved comments into partial, fixed alignment