model changed, minor changes, pl language support