Continued with restructuring + syntax fixes
A few more runtime fixes