Comment out semantic stuffs
Merge master
Some tweaks