Continue tutorial redaction and some minor code changes