more restricted Java
TypeScript version now ready to build
merge