small improvement
updated language
removed test features