improve build system, add some missing keywords