fixing property names by cleaning them and adding a throttle to the async tasks
merging locan and github branch