location and syntax fixes