multiple locations and minor bug fixes