Lots of improvements - properties show up correctly now!