add make-keyword function
add export for make-keyword function
uncomment accidently commented code
fix redundant inheritance
replace set-shader method with set-shader macro