Use map of string to Point for vector to better represent properties
Fix readme again