Minor changes, comments on flow