BAO: Improved tutorial!

Among other minor bug fixes and improvements.