clean pass on additional checks, improved demo