refactor some code, add new properties, adjust strings
update copyright file header