Fixed commit errors....

Also allowed for single word name in location