fix bogus property lookup
fix real-world bugs