fix some annotations and expand discrimination map
workaround sublime highlighting
remove var dump in test
use the container webforge container when avaible (this fixes wrong init local dir)