clean up nodeform.inc and add more block stuff