property value increment bugfix; some improvments