added tags and states
minor fix
Polish texts
Json creation
Merge remote-tracking branch 'origin/master'