more work on fixing missing properties currently broken