Default values added. Location algorithm implemented. Minor clean up.