bug fix in Properties and more corrections