fixing node nesting issue by unnesting and other fixes
fixing node nesting issue by unnesting and other fixes

kdawgwilk/vapor,qutheory/vapor,vapor/vapor,qutheory/vapor,qutheory/vapor,kdawgwilk/vapor,LoganWright/vapor,vapor/vapor,mpclarkson/vapor,vapor/vapor,kdawgwilk/vapor,LoganWright/vapor,vapor/vapor