properties and bugfix