Added a couple more control flow demos and 
refactored to get rid of warnings

Change-Id: I5ac757a9a4a2560c876e570d8c76a1aebea6bd31