Reworking properties and binding
Fixed some compile problems