Fixed many issues, still need to figure out how property maps really work