improve comments, code in model, language tests