Testing - merging in stable copy for master

This is mostly stable with a bunch of syntax errors cleared.