Added add capability to Master Place Name

Also tidied up code