Made some bug fixes
Fixed enum and keyword namespace problems. Need to do keyword and enum examples