first implementation of #67
made the type limitation conditional and fixed an issue where the language wasnt correctly set