adjusted appearance of manual location/removed hardcoded strings