Changes, fixes, getting the property reference functionality up-to-snuff.