fixed alot of the property fetching code